[timeline] fix display of unit above #142
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… 140-timeline-fix-display-of-unit-above
luciob
requested changes
Nov 6, 2023
src/grid/CellGroup/index.tsx
Outdated
Comment on lines
11
to
12
| dayInfo?: { thisMonth?: number; untilNow?: number; backHour: boolean; forNowHour: boolean }[]; | ||
| } |
There was a problem hiding this comment.
Add a type for this data structure
src/grid/Cells/index.tsx
Outdated
Comment on lines
20
to
38
| const dayInfo: { thisMonth?: number; untilNow?: number; backHour: boolean; forNowHour: boolean }[] = []; | ||
| if (unitAbove === "month" || unitAbove === "day") { | ||
| aboveTimeBlocks.forEach((column, index) => { | ||
| const hrs = column.end!.diff(column.start!, "hour").hours; | ||
| const month = getMonth(column); | ||
| const year = getYear(column); | ||
| const currentMonthDays = daysInMonth(Number(month), Number(year)); | ||
| const bchour = hrs > 24 ? true : false; | ||
| if (index === 0) { | ||
| const startDay = getStartMonthsDay(interval.start!); | ||
| const daysToMonthEnd = currentMonthDays - Number(startDay) + 1; | ||
| dayInfo.push({ thisMonth: daysToMonthEnd, untilNow: daysToMonthEnd, backHour: bchour, forNowHour: false }); | ||
| return; | ||
| } | ||
| const forNowHour = dayInfo[index - 1].forNowHour ? true : dayInfo[index - 1].backHour ? true : false; | ||
| const n = dayInfo[index - 1].untilNow! + currentMonthDays; | ||
| dayInfo.push({ thisMonth: currentMonthDays, untilNow: n, backHour: bchour, forNowHour: forNowHour }); | ||
| }); | ||
| } |
There was a problem hiding this comment.
Let's use a memo here if possible
luciob
approved these changes
Nov 6, 2023
src/timeline/TimelineContext.tsx
Outdated
| blockEnd = intervalEnd; | ||
| } | ||
|
|
||
| logError("Adding Block", `${blockStart.toFormat("dd/MM/yy HH:mm")} > ${blockEnd.toFormat("dd/MM/yy HH:mm")}`); |
There was a problem hiding this comment.
Remove logError call or switch to logDebug, or delete
|
🎉 This PR is included in version 1.16.2 🎉 The release is available on: Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR closes #140